From 417459b4f36b090097323f0f7d3c8469e9687f66 Mon Sep 17 00:00:00 2001
From: 艾金辉 <1144154118@qq.com>
Date: 星期五, 21 七月 2023 15:09:08 +0800
Subject: [PATCH] 根据用户名获取三一列表
---
ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarController.java | 83 +++++++++++++++++++++++++++++++++++++++++
1 files changed, 82 insertions(+), 1 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 518e113..9ddd55b 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,13 +1,18 @@
package com.ruoyi.sy.controller;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import com.ruoyi.client.ARDCarGPSLogInClient;
+import com.ruoyi.client.ARDCarSYGPSClient;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.uuid.IdUtils;
+import com.ruoyi.sy.service.IArdSyUserService;
+import com.ruoyi.sy.service.SysParaService;
import com.ruoyi.system.domain.SysConfig;
import com.ruoyi.system.service.ISysConfigService;
import com.ruoyi.utils.httpclient.SYCarClient;
@@ -45,6 +50,14 @@
@Autowired
private ISysConfigService sysConfigService;
+
+ private Map<Integer,Map<String,String>> logInMap = new HashMap();
+
+ @Autowired
+ private SysParaService sysParaService;
+
+ @Autowired
+ private IArdSyUserService iArdSyUserService;
/**
* 鏌ヨ涓変竴杞﹁締鍒楄〃
@@ -161,6 +174,24 @@
}
/**
+ * 鑾峰彇鍏ㄩ儴鐨勪笁涓�杞﹁締
+ */
+ @PreAuthorize("@ss.hasPermi('sy:syCar:getArdSyCarAll')")
+ @PostMapping("/getArdSyCarAll")
+ @ApiOperation("鑾峰彇鍏ㄩ儴鐨勪笁涓�杞﹁締")
+ public Map<String,Object> getArdSyCarAll(){
+ String userId = SecurityUtils.getUserId();
+ Map<String,Object> result = ardSyCarService.getArdSyCarAll(userId);
+ if(((String)result.get("code")).equals("500")){
+ return error((String) result.get("data"));
+ }else if(((String)result.get("code")).equals("200")){
+ return success(result.get("data"));
+ }else{
+ return error("");
+ }
+ }
+
+ /**
* 鑾峰彇鍏ㄩ儴杞﹁締妯″瀷
*/
@PreAuthorize("@ss.hasPermi('sy:syCar:getAllCarModel')")
@@ -181,7 +212,7 @@
@PreAuthorize("@ss.hasPermi('sy:syCar:uploadCarPicture')")
@PostMapping("/uploadCarPicture")
@ApiOperation("涓婁紶杞﹁締鍥剧墖")
- public Map<String,Object> uploadCarPicture(@RequestParam("id") String id,@RequestParam("carPicture") MultipartFile carPicture){
+ public Map<String,Object> uploadCarPicture(@RequestParam(value = "id",required = false,defaultValue = "") String id,@RequestParam("carPicture") MultipartFile carPicture){
try{
String result = ardSyCarService.uploadCarPicture(id,carPicture);
return success(result);
@@ -190,4 +221,54 @@
}
}
+ @PreAuthorize("@ss.hasPermi('sy:syCar:allListByUser')")
+ @PostMapping("allListByUser")
+ @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"));
+ }
+ 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;
+ }
+ }
+ 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;
+ }
+ return result0;
+ }
}
--
Gitblit v1.9.3