From b5cf2539edf29b0da8bde02ad3b5c1c373824a34 Mon Sep 17 00:00:00 2001
From: 艾金辉 <1144154118@qq.com>
Date: 星期一, 24 七月 2023 15:23:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
/dev/null | 78 ---------------------------------------
ard-work/src/main/java/com/ruoyi/app/tasktext/controller/ArdAppTaskTextController.java | 5 ++
ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarServiceImpl.java | 13 ++----
3 files changed, 10 insertions(+), 86 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/app/tasktext/controller/ArdAppTaskTextController.java b/ard-work/src/main/java/com/ruoyi/app/tasktext/controller/ArdAppTaskTextController.java
index 70fd7b9..b3b0eaa 100644
--- a/ard-work/src/main/java/com/ruoyi/app/tasktext/controller/ArdAppTaskTextController.java
+++ b/ard-work/src/main/java/com/ruoyi/app/tasktext/controller/ArdAppTaskTextController.java
@@ -2,6 +2,9 @@
import java.util.List;
import javax.servlet.http.HttpServletResponse;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@@ -29,6 +32,7 @@
*/
@RestController
@RequestMapping("/task/text")
+@Api(tags = "app浠诲姟鎻忚堪")
public class ArdAppTaskTextController extends BaseController
{
@Autowired
@@ -39,6 +43,7 @@
*/
@PreAuthorize("@ss.hasPermi('task:text:list')")
@GetMapping("/list")
+ @ApiOperation("鏌ヨapp浠诲姟鎻忚堪鍒楄〃")
public TableDataInfo list(ArdAppTaskText ardAppTaskText)
{
startPage();
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 6e4a04a..014701b 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
@@ -23,15 +23,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;
@@ -371,11 +368,11 @@
SysUser sysUser = userMapper.selectUserById(key);
String deptId = String.valueOf(sysUser.getDeptId());
Map<String,Map<String,Object>> map = PositionContainer.getDeptPositionMap().get(deptId);
- System.out.println("/////////////");
- System.out.println(PositionContainer.getDeptPositionMap());
- Map<Integer,Object> data = new HashMap();
- data.put(30000, map.values());
- WebSocketUtils.sendMessage(ONLINE_USER_SESSIONS.get(key), JSON.toJSONString(data));
+ if(map != null){
+ Map<Integer,Object> data = new HashMap();
+ data.put(30000, map.values());
+ WebSocketUtils.sendMessage(ONLINE_USER_SESSIONS.get(key), JSON.toJSONString(data));
+ }
}
}
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