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 | 125 ++++++++++++++++++++++++++++++++++++++++-
1 files changed, 122 insertions(+), 3 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 efd8705..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,15 +1,24 @@
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;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import org.bytedeco.javacv.CanvasFrame;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -23,6 +32,7 @@
import com.ruoyi.common.core.page.TableDataInfo;
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
+import org.springframework.web.multipart.MultipartFile;
/**
* 涓変竴杞﹁締Controller
@@ -40,6 +50,14 @@
@Autowired
private ISysConfigService sysConfigService;
+
+ private Map<Integer,Map<String,String>> logInMap = new HashMap();
+
+ @Autowired
+ private SysParaService sysParaService;
+
+ @Autowired
+ private IArdSyUserService iArdSyUserService;
/**
* 鏌ヨ涓変竴杞﹁締鍒楄〃
@@ -82,8 +100,11 @@
@PreAuthorize("@ss.hasPermi('sy:syCar:add')")
@Log(title = "涓変竴杞﹁締", businessType = BusinessType.INSERT)
@PostMapping
+ @ApiOperation("鏂板涓変竴杞﹁締")
public AjaxResult add(@RequestBody ArdSyCar ardSyCar)
{
+ String id = IdUtils.simpleUUID();
+ ardSyCar.setId(id);
return toAjax(ardSyCarService.insertArdSyCar(ardSyCar));
}
@@ -93,6 +114,7 @@
@PreAuthorize("@ss.hasPermi('sy:syCar:edit')")
@Log(title = "涓変竴杞﹁締", businessType = BusinessType.UPDATE)
@PutMapping
+ @ApiOperation("淇敼涓変竴杞﹁締")
public AjaxResult edit(@RequestBody ArdSyCar ardSyCar)
{
return toAjax(ardSyCarService.updateArdSyCar(ardSyCar));
@@ -104,6 +126,7 @@
@PreAuthorize("@ss.hasPermi('sy:syCar:remove')")
@Log(title = "涓変竴杞﹁締", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
+ @ApiOperation("鍒犻櫎涓変竴杞﹁締")
public AjaxResult remove(@PathVariable String[] ids)
{
return toAjax(ardSyCarService.deleteArdSyCarByIds(ids));
@@ -139,9 +162,7 @@
@PostMapping("/getArdSyCarNoRight")
@ApiOperation("鑾峰彇鏈寕鎺ユ潈闄愮殑涓変竴杞﹁締")
public Map<String,Object> getArdSyCarNoRight(){
- ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
- HttpServletRequest request = attributes.getRequest();
- String userId = request.getHeader("token");
+ String userId = SecurityUtils.getUserId();
Map<String,Object> result = ardSyCarService.getArdSyCarNoRight(userId);
if(((String)result.get("code")).equals("500")){
return error((String) result.get("data"));
@@ -152,4 +173,102 @@
}
}
+ /**
+ * 鑾峰彇鍏ㄩ儴鐨勪笁涓�杞﹁締
+ */
+ @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')")
+ @PostMapping("/getAllCarModel")
+ @ApiOperation("鑾峰彇鍏ㄩ儴杞﹁締妯″瀷")
+ public Map<String,Object> getAllCarModel(){
+ try{
+ List<Map<String,String>> result = ardSyCarService.getAllCarModel();
+ return toAjaxList(result);
+ } catch(Exception e){
+ return toAjaxList(new ArrayList());
+ }
+ }
+
+ /**
+ * 涓婁紶杞﹁締鍥剧墖
+ */
+ @PreAuthorize("@ss.hasPermi('sy:syCar:uploadCarPicture')")
+ @PostMapping("/uploadCarPicture")
+ @ApiOperation("涓婁紶杞﹁締鍥剧墖")
+ 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);
+ } catch(Exception e){
+ return error("");
+ }
+ }
+
+ @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