From 2f4b64274233eccba253a49c022b8ff1355162ed Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期一, 24 七月 2023 14:06:17 +0800
Subject: [PATCH] 三一车辆接口改為forest，刪除okhttp客戶端提交
---
/dev/null | 78 ---------------------------------------
ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarController.java | 10 -----
ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarServiceImpl.java | 3 -
3 files changed, 0 insertions(+), 91 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarController.java b/ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarController.java
index 0d49fa6..a3e5a56 100644
--- a/ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarController.java
+++ b/ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarController.java
@@ -1,14 +1,10 @@
package com.ruoyi.sy.controller;
-import java.text.Collator;
-import java.util.*;
import java.util.*;
import javax.annotation.PostConstruct;
import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import com.alibaba.fastjson2.JSON;
import com.ruoyi.client.ARDCarGPSLogInClient;
import com.ruoyi.client.ARDCarSYGPSClient;
import com.ruoyi.common.utils.SecurityUtils;
@@ -19,11 +15,7 @@
import com.ruoyi.sy.service.IArdSyUserService;
import com.ruoyi.system.domain.SysConfig;
import com.ruoyi.system.service.ISysConfigService;
-import com.ruoyi.system.service.ISysDeptService;
-import com.ruoyi.system.service.ISysUserService;
-import com.ruoyi.utils.forest.RongCloudClient;
import com.ruoyi.utils.forest.SYClient;
-import com.ruoyi.utils.httpclient.SYCarClient;
import com.ruoyi.utils.result.Results;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -40,8 +32,6 @@
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.core.page.TableDataInfo;
import org.springframework.web.multipart.MultipartFile;
-
-import static com.ruoyi.common.websocket.util.WebSocketUtils.ONLINE_USER_SESSIONS;
/**
* 涓変竴杞﹁締Controller
diff --git a/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarServiceImpl.java b/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarServiceImpl.java
index 5f23307..f788f0d 100644
--- a/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarServiceImpl.java
@@ -21,15 +21,12 @@
import com.ruoyi.system.mapper.SysConfigMapper;
import com.ruoyi.system.mapper.SysUserMapper;
import com.ruoyi.utils.forest.SYClient;
-import com.ruoyi.utils.httpclient.SYCarClient;
-import com.ruoyi.utils.result.Constants;
import com.ruoyi.utils.result.Results;
import io.minio.GetPresignedObjectUrlArgs;
import io.minio.ListObjectsArgs;
import io.minio.PutObjectArgs;
import io.minio.Result;
import io.minio.http.Method;
-import io.minio.messages.Contents;
import io.minio.messages.Item;
import org.apache.commons.codec.digest.DigestUtils;
import org.springframework.stereotype.Service;
diff --git a/ard-work/src/main/java/com/ruoyi/utils/httpclient/SYCarClient.java b/ard-work/src/main/java/com/ruoyi/utils/httpclient/SYCarClient.java
deleted file mode 100644
index 19d2d80..0000000
--- a/ard-work/src/main/java/com/ruoyi/utils/httpclient/SYCarClient.java
+++ /dev/null
@@ -1,78 +0,0 @@
-package com.ruoyi.utils.httpclient;
-
-import com.alibaba.fastjson2.JSON;
-import okhttp3.OkHttpClient;
-import okhttp3.Request;
-import okhttp3.Response;
-import okhttp3.ResponseBody;
-import org.apache.commons.codec.digest.DigestUtils;
-
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-
-public class SYCarClient {
-
- public static Map<String,Object> logIn(String syURL, String userId, String password){
- OkHttpClient okHttpClient = new OkHttpClient();
-
- String passwordMd5 = DigestUtils.md5Hex(password);
-
- Request request = new Request.Builder()
- .url(syURL + "/gps-web/api/login.jsp?"+"password="+passwordMd5+"&userId="+userId+"&loginType=user&loginWay=interface&loginLang=zh_CN")
- .build();
- Response response = null;
- try {
- response = okHttpClient.newCall(request).execute();
- } catch (IOException e1) {
- // TODO Auto-generated catch block
- e1.printStackTrace();
- }
-
- response.headers(); //鍝嶅簲澶�
-
- ResponseBody responseBody = response.body();
-
- try {
- String message = responseBody.string();// 鍝嶅簲浣�
- Map<String,Object> map = (Map<String, Object>) JSON.parse(message);
- map.put("passwordMd5", passwordMd5);
- //System.out.println(message);
- return map;
- } catch (IOException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- return new HashMap();
- }
- }
-
- public static Map<String,Object> getCarList(String syURL, String sessionId){
- OkHttpClient okHttpClient = new OkHttpClient();
-
- Request request = new Request.Builder()
- .url(syURL + "/gps-web/api/get_car_list.jsp?teamId=&detail=false&sessionId="+sessionId)
- .build();
- Response response = null;
- try {
- response = okHttpClient.newCall(request).execute();
- } catch (IOException e1) {
- // TODO Auto-generated catch block
- e1.printStackTrace();
- }
-
- response.headers(); //鍝嶅簲澶�
-
- ResponseBody responseBody = response.body();
-
- try {
- String message = responseBody.string();// 鍝嶅簲浣�
- Map<String,Object> map = (Map<String, Object>) JSON.parse(message);
- //System.out.println(message);
- return map;
- } catch (IOException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- return new HashMap();
- }
- }
-}
--
Gitblit v1.9.3