From 1b5007fd66cb2c56e7b54b793cdd3f29785f5c04 Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期四, 20 七月 2023 15:16:31 +0800
Subject: [PATCH] 查询车模型提交

---
 ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarController.java |   22 +++++++++++++++++++---
 1 files changed, 19 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..d114218 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,18 @@
 package com.ruoyi.sy.controller;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import com.ruoyi.common.utils.SecurityUtils;
 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.*;
@@ -139,9 +142,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 +153,19 @@
         }
     }
 
+    /**
+     * 鑾峰彇鍏ㄩ儴杞﹁締妯″瀷
+     */
+    @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());
+        }
+    }
+
 }

--
Gitblit v1.9.3