From b1f91d23c01266dda8cad34aa866bcac741a21cf Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期六, 23 十二月 2023 17:03:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarController.java |   21 ++++++++++++++++++---
 1 files changed, 18 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 a372488..e7fb078 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
@@ -233,7 +233,7 @@
     /**
      * 鑾峰彇鍏ㄩ儴鐨勪笁涓�杞﹁締
      */
-    @PreAuthorize("@ss.hasPermi('sy:syCar:getArdSyCarAll')")
+//    @PreAuthorize("@ss.hasPermi('sy:syCar:getArdSyCarAll')")
     @PostMapping("/getArdSyCarAll")
     @ApiOperation("鑾峰彇鍏ㄩ儴鐨勪笁涓�杞﹁締")
     public Map<String,Object> getArdSyCarAll(){
@@ -251,7 +251,7 @@
     /**
      * 鑾峰彇鍏ㄩ儴杞﹁締妯″瀷
      */
-    @PreAuthorize("@ss.hasPermi('sy:syCar:getAllCarModel')")
+//    @PreAuthorize("@ss.hasPermi('sy:syCar:getAllCarModel')")
     @PostMapping("/getAllCarModel")
     @ApiOperation("鑾峰彇鍏ㄩ儴杞﹁締妯″瀷")
     public Map<String,Object> getAllCarModel(){
@@ -314,7 +314,7 @@
         }
     }
 
-    @PreAuthorize("@ss.hasPermi('sy:syCar:carListById')")
+//    @PreAuthorize("@ss.hasPermi('sy:syCar:carListById')")
     @PostMapping("/carListById/{id}")
     @ApiOperation("鏍规嵁杞﹁締ID鑾峰彇杞﹁締鍒楄〃")
     public Results carListById(@PathVariable String id){
@@ -451,4 +451,19 @@
         return AjaxResult.success("鑾峰彇鍦板潃鎴愬姛锛�",sysConfigService.selectConfigByKey("threeOneVideo"));
     }
 
+    @PreAuthorize("@ss.hasPermi('sy:syCar:getAlarmHPfmCountDetail')")
+    @PostMapping("getAlarmHPfmCountDetail")
+    @ApiOperation("鏍规嵁杞﹁締鍜屾椂闂存鏌ヨ鎶ヨ鍘嗗彶璁板綍璇︽儏")
+    public AjaxResult getAlarmHPfmCountDetail(@RequestBody Map<String,String> map){
+        String usersId = SecurityUtils.getUserId();
+        ArdSyUser ardSyUser = iArdSyUserService.userById(usersId);
+        String carId = map.get("carId");
+        String startTime = map.get("startTime");
+        String endTime = map.get("endTime");
+        String syURL = sysConfigService.getSYURL();
+        String sessionId = ardSyCarService.getSessionId(syURL,ardSyUser);
+        Map<String, Object> mapDetail =  ardSyCarService.getAlarmHPfmCountDetail(sessionId,usersId,carId,startTime,endTime,syURL);
+        return AjaxResult.success(mapDetail);
+    }
+
 }

--
Gitblit v1.9.3