From 82f8f0065a27acf9f7e1558b04fa75ce68a7fa50 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期二, 26 三月 2024 17:05:30 +0800
Subject: [PATCH] 31

---
 ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarController.java |   10 +++++-----
 1 files changed, 5 insertions(+), 5 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 90f4213..feaa81f 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
@@ -113,8 +113,8 @@
                 ardSyCarService.sendArdSyCarPosition();
             }
         };
-        carPositionTimer.scheduleAtFixedRate(carPositionTask,date,3*1000);//鍚敤
-        //杞﹁締瀹炴椂浣嶇疆绾跨▼
+        //carPositionTimer.scheduleAtFixedRate(carPositionTask,date,3*1000);//寮冪敤
+        //杞﹁締瀹炴椂鎶ヨ绾跨▼
         PushClientImplAlarm pushClientImplAlarm = new PushClientImplAlarm(ip,ardSyUserList.get(0).getUserId(),ardSyUserList.get(0).getPassword());
         Thread pushClientImplAlarmThread = new Thread(pushClientImplAlarm);
         pushClientImplAlarmThread.start();
@@ -188,7 +188,7 @@
      */
     @PreAuthorize("@ss.hasPermi('sy:syCar:remove')")
     @Log(title = "涓変竴杞﹁締", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
+    @DeleteMapping("/{ids}")
     @ApiOperation("鍒犻櫎涓変竴杞﹁締")
     public AjaxResult remove(@PathVariable String[] ids)
     {
@@ -326,7 +326,7 @@
         }
     }
 
-//    @PreAuthorize("@ss.hasPermi('sy:syCar:carListById')")
+    //    @PreAuthorize("@ss.hasPermi('sy:syCar:carListById')")
     @PostMapping("/carListById/{id}")
     @ApiOperation("鏍规嵁杞﹁締ID鑾峰彇杞﹁締鍒楄〃")
     public Results carListById(@PathVariable String id){
@@ -369,7 +369,7 @@
         SysUser sysUser = sysUserService.selectUserById(usersId);
         Map<String, Map<String,Map<String,Object>>> deptPositionMap = PositionContainer.getDeptPositionMap();
         if(deptPositionMap.isEmpty()){
-            return Results.succeed();
+            return Results.error("31骞冲彴鏃犺溅杈嗕綅缃繑鍥�");
         }else {
 //            return Results.succeed(deptPositionMap.get(sysUser.getDeptId().toString()).get(map.get("carId")));
             return Results.succeed(deptPositionMap.get(sysUser.getDeptId().toString()));

--
Gitblit v1.9.3