From 3c075575f95f2e10a66d38e1b28c284e938f2e52 Mon Sep 17 00:00:00 2001
From: 艾金辉 <1144154118@qq.com>
Date: 星期五, 21 七月 2023 17:20:42 +0800
Subject: [PATCH] 根据用户名获取三一列表
---
ard-work/pom.xml | 7 ++
ard-work/src/main/java/com/ruoyi/sy/mapper/ArdSyUserMapper.java | 6 +
ruoyi-admin/src/main/resources/application-druid.yml | 4
ard-work/src/main/java/com/ruoyi/client/ARDCarGPSLogInClient.java | 10 +-
ard-work/src/main/java/com/ruoyi/sy/service/IArdSyUserService.java | 2
ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarController.java | 78 +++++++++++++------------
ard-work/src/main/resources/mapper/sy/ArdSyUserMapper.xml | 5 +
ard-work/src/main/java/com/ruoyi/sy/mapper/SysParaMapper.java | 4 +
ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyUserServiceImpl.java | 5 +
ard-work/src/main/java/com/ruoyi/client/ARDCarSYGPSClient.java | 10 +-
10 files changed, 79 insertions(+), 52 deletions(-)
diff --git a/ard-work/pom.xml b/ard-work/pom.xml
index 7924856..bd7875b 100644
--- a/ard-work/pom.xml
+++ b/ard-work/pom.xml
@@ -117,6 +117,13 @@
<artifactId>lombok</artifactId>
<optional>true</optional>
</dependency>
+ <!-- https://mvnrepository.com/artifact/com.alibaba.fastjson2/fastjson2 -->
+ <dependency>
+ <groupId>com.alibaba.fastjson2</groupId>
+ <artifactId>fastjson2</artifactId>
+ <version>2.0.36</version>
+ </dependency>
+
</dependencies>
<build>
diff --git a/ard-work/src/main/java/com/ruoyi/client/ARDCarGPSLogInClient.java b/ard-work/src/main/java/com/ruoyi/client/ARDCarGPSLogInClient.java
index 6c53444..afe65a5 100644
--- a/ard-work/src/main/java/com/ruoyi/client/ARDCarGPSLogInClient.java
+++ b/ard-work/src/main/java/com/ruoyi/client/ARDCarGPSLogInClient.java
@@ -1,10 +1,10 @@
package com.ruoyi.client;
-import com.alibaba.fastjson.JSON;
-import com.squareup.okhttp.OkHttpClient;
-import com.squareup.okhttp.Request;
-import com.squareup.okhttp.Response;
-import com.squareup.okhttp.ResponseBody;
+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;
diff --git a/ard-work/src/main/java/com/ruoyi/client/ARDCarSYGPSClient.java b/ard-work/src/main/java/com/ruoyi/client/ARDCarSYGPSClient.java
index d2dff2e..c8d6f9a 100644
--- a/ard-work/src/main/java/com/ruoyi/client/ARDCarSYGPSClient.java
+++ b/ard-work/src/main/java/com/ruoyi/client/ARDCarSYGPSClient.java
@@ -1,10 +1,10 @@
package com.ruoyi.client;
-import com.alibaba.fastjson.JSON;
-import com.squareup.okhttp.OkHttpClient;
-import com.squareup.okhttp.Request;
-import com.squareup.okhttp.Response;
-import com.squareup.okhttp.ResponseBody;
+import com.alibaba.fastjson2.JSON;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.Response;
+import okhttp3.ResponseBody;
import java.io.IOException;
import java.util.HashMap;
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 102b824..2eb89b7 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
@@ -11,6 +11,7 @@
import com.ruoyi.client.ARDCarSYGPSClient;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.uuid.IdUtils;
+import com.ruoyi.sy.domain.ArdSyUser;
import com.ruoyi.sy.service.IArdSyUserService;
import com.ruoyi.sy.service.SysParaService;
import com.ruoyi.system.domain.SysConfig;
@@ -226,48 +227,49 @@
@ApiOperation("鏍规嵁鐢ㄦ埛鑾峰彇涓変竴鍒楄〃")
public Map<String,Object> allListByUser(){
String usersId = SecurityUtils.getUserId();
- Map<String, String> result = logInMap.get(Integer.parseInt(usersId));
- String syURL = sysParaService.getSYURL();
- if(result == null){
- Map<String,Object> m = iArdSyUserService.selectArdSyUserByUsersId(Integer.parseInt(usersId));
- if(m == null){
- Map<String,Object> map0 = new HashMap();
- map0.put("rspDesc", "褰撳墠鐧诲綍鐢ㄦ埛鏈寕鎺ヨ溅杈嗘潈闄�");
- map0.put("rspCode", "0");
- return map0;
- }
- Map<String, Object> result0 = ARDCarGPSLogInClient.loginIn(syURL,(String) m.get("userId"), (String) m.get("password"));
- result = new HashMap();
- result.put("userId", (String) m.get("userId"));
- result.put("sessionId", (String) result0.get("sessionId"));
- }
+ ArdSyUser ardSyUser = iArdSyUserService.userById(usersId);
Map<String,Object> result0 = new HashMap();
- try {
- result0 = ARDCarSYGPSClient.getCarGPSTeamList(syURL,result.get("userId"),result.get("sessionId"));//
- } catch (Exception e) {
- Map<String,Object> map = new HashMap();
- map.put("rspCode", 0);
- map.put("list", new ArrayList());
- return map;
- }
- int online = 0;
- for(Map<String,Object> map : (List<Map<String,Object>>) result0.get("list")){
- Map<String,Object> resultMap = (Map<String, Object>) ARDCarSYGPSClient.getCarListByTeamId(syURL,(String)map.get("teamId"),result.get("sessionId"));
- List<Map<String,Object>> carList = (List<Map<String, Object>>) resultMap.get("carList");
- for(Map<String,Object> m : carList){
- if(((String) m.get("stateCn")).contains("鍦ㄧ嚎")){
- online = online + 1;
- }else{
- continue;
- }
+ //鍒ゆ柇鍏宠仈琛ㄦ槸鍚︽湁鏁版嵁
+ if(ardSyUser!=null){
+ //31鐢ㄦ埛鍚嶅瘑鐮�
+ String username31 = ardSyUser.getUserId();
+ String password31 = ardSyUser.getPassword();
+ //鏌ヨ鍦板潃
+ Map<String, String> result = logInMap.get(Integer.parseInt(usersId));
+ String syURL = sysParaService.getSYURL();
+ Map<String, Object> result1 = ARDCarGPSLogInClient.loginIn(syURL,username31, password31);
+ result = new HashMap();
+ result.put("userId", username31);
+ result.put("sessionId", (String) result1.get("sessionId"));
+ try {
+ result0 = ARDCarSYGPSClient.getCarGPSTeamList(syURL,result.get("userId"),result.get("sessionId"));//
+ } catch (Exception e) {
+ Map<String,Object> map = new HashMap();
+ map.put("rspCode", 0);
+ map.put("list", new ArrayList());
+ return map;
}
- for(Map<String,Object> m : (List<Map<String,Object>>) result0.get("list")){
- if(((String) m.get("teamId")).equals(((String) map.get("teamId")))){
- map.put("count", Integer.parseInt((String) m.get("carNum")));
+ int online = 0;
+ for(Map<String,Object> map : (List<Map<String,Object>>) result0.get("list")){
+ Map<String,Object> resultMap = (Map<String, Object>) ARDCarSYGPSClient.getCarListByTeamId(syURL,(String)map.get("teamId"),result.get("sessionId"));
+ List<Map<String,Object>> carList = (List<Map<String, Object>>) resultMap.get("carList");
+ for(Map<String,Object> m : carList){
+ if(((String) m.get("stateCn")).contains("鍦ㄧ嚎")){
+ online = online + 1;
+ }else{
+ continue;
+ }
}
+ for(Map<String,Object> m : (List<Map<String,Object>>) result0.get("list")){
+ if(((String) m.get("teamId")).equals(((String) map.get("teamId")))){
+ map.put("count", Integer.parseInt((String) m.get("carNum")));
+ }
+ }
+ map.put("online", online);
+ online = 0;
}
- map.put("online", online);
- online = 0;
+ }else {
+ result0.put("鍒楄〃涓虹┖锛�","鏃犲叧鑱旇处鍙凤紒");
}
return result0;
}
diff --git a/ard-work/src/main/java/com/ruoyi/sy/mapper/ArdSyUserMapper.java b/ard-work/src/main/java/com/ruoyi/sy/mapper/ArdSyUserMapper.java
index 9c823c7..79b167b 100644
--- a/ard-work/src/main/java/com/ruoyi/sy/mapper/ArdSyUserMapper.java
+++ b/ard-work/src/main/java/com/ruoyi/sy/mapper/ArdSyUserMapper.java
@@ -5,6 +5,7 @@
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.sy.domain.ArdSyUser;
+import org.apache.ibatis.annotations.MapKey;
/**
* 涓変竴杞﹁締鐢ㄦ埛Mapper鎺ュ彛
@@ -76,5 +77,8 @@
*/
public List<SysUser> getSysUserNoSY();
- public Map<String,Object> selectArdSyUserByUsersId(Integer usersId);
+ @MapKey("id")
+ Map<String,Object> selectArdSyUserByUsersId(Integer usersId);
+
+ ArdSyUser userById(String id);
}
diff --git a/ard-work/src/main/java/com/ruoyi/sy/mapper/SysParaMapper.java b/ard-work/src/main/java/com/ruoyi/sy/mapper/SysParaMapper.java
index fbdb80d..ecc4dca 100644
--- a/ard-work/src/main/java/com/ruoyi/sy/mapper/SysParaMapper.java
+++ b/ard-work/src/main/java/com/ruoyi/sy/mapper/SysParaMapper.java
@@ -1,6 +1,8 @@
package com.ruoyi.sy.mapper;
import com.baomidou.dynamic.datasource.annotation.DS;
+import com.ruoyi.common.annotation.DataSource;
+import com.ruoyi.common.enums.DataSourceType;
import com.ruoyi.sy.domain.SysPara;
import com.ruoyi.sy.domain.SysParaExample;
import java.util.List;
@@ -8,7 +10,7 @@
/**
* @author 11441
*/
-@DS("slave")
+@DataSource(value = DataSourceType.SLAVE)
public interface SysParaMapper {
List<SysPara> selectByExample(String sysType);
diff --git a/ard-work/src/main/java/com/ruoyi/sy/service/IArdSyUserService.java b/ard-work/src/main/java/com/ruoyi/sy/service/IArdSyUserService.java
index 289dd7f..cdb48ea 100644
--- a/ard-work/src/main/java/com/ruoyi/sy/service/IArdSyUserService.java
+++ b/ard-work/src/main/java/com/ruoyi/sy/service/IArdSyUserService.java
@@ -75,4 +75,6 @@
public List<SysUser> getSysUserNoSY();
Map<String,Object> selectArdSyUserByUsersId(Integer usersId);
+
+ ArdSyUser userById(String id);
}
diff --git a/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyUserServiceImpl.java b/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyUserServiceImpl.java
index 924fb9a..de6ae1b 100644
--- a/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyUserServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyUserServiceImpl.java
@@ -121,4 +121,9 @@
Map<String,Object> result = ardSyUserMapper.selectArdSyUserByUsersId(usersId);
return result;
}
+
+ @Override
+ public ArdSyUser userById(String id) {
+ return ardSyUserMapper.userById(id);
+ }
}
diff --git a/ard-work/src/main/resources/mapper/sy/ArdSyUserMapper.xml b/ard-work/src/main/resources/mapper/sy/ArdSyUserMapper.xml
index 249ef50..7918055 100644
--- a/ard-work/src/main/resources/mapper/sy/ArdSyUserMapper.xml
+++ b/ard-work/src/main/resources/mapper/sy/ArdSyUserMapper.xml
@@ -132,4 +132,9 @@
inner join ard_users au on aus.users_id = au.id
where aus.users_id = #{usersId}
</select>
+
+ <select id="userById" parameterType="String" resultMap="ArdSyUserResult">
+ <include refid="selectArdSyUserVo"/>
+ where sys_user_id = #{id}
+ </select>
</mapper>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml
index 916b601..103ba5c 100644
--- a/ruoyi-admin/src/main/resources/application-druid.yml
+++ b/ruoyi-admin/src/main/resources/application-druid.yml
@@ -15,7 +15,7 @@
# 浠庡簱鏁版嵁婧�
slave:
# 浠庢暟鎹簮寮�鍏�/榛樿鍏抽棴
-# enabled: true
+ enabled: true
url: jdbc:postgresql://112.98.126.2:35432/ard732
username: postgres
password: Yykj.2017
@@ -38,7 +38,7 @@
testWhileIdle: true
testOnBorrow: false
testOnReturn: false
- webStatFilter:
+ webStatFilter:
enabled: true
statViewServlet:
enabled: true
--
Gitblit v1.9.3