From cb77a6b162f59b6664e10bdfc26463fc909f4c22 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期三, 18 十月 2023 15:48:55 +0800
Subject: [PATCH] 查询所有未挂锁的车辆

---
 ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarLockController.java |   76 ++++++++++++++++++++++++++++++--------
 1 files changed, 60 insertions(+), 16 deletions(-)

diff --git a/ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarLockController.java b/ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarLockController.java
index 74027fb..a5d3a43 100644
--- a/ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarLockController.java
+++ b/ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarLockController.java
@@ -1,48 +1,92 @@
 package com.ruoyi.sy.controller;
 
+import com.alibaba.fastjson.JSONObject;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.sy.domain.ArdSyCarLock;
+import com.ruoyi.sy.domain.ArdSyUser;
+import com.ruoyi.sy.service.ArdSyCarLockService;
+import com.ruoyi.sy.service.IArdSyCarService;
+import com.ruoyi.sy.service.IArdSyUserService;
+import com.ruoyi.sy.vo.CarVo;
+import com.ruoyi.system.service.ISysConfigService;
 import com.ruoyi.utils.result.Results;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 @RestController
 @RequestMapping("syLock")
 @Api(tags = "杞﹁締閿佺鐞�")
 public class ArdSyCarLockController {
 
+    @Autowired
+    private IArdSyUserService iArdSyUserService;
+    @Autowired
+    private ISysConfigService sysConfigService;
+    @Autowired
+    private IArdSyCarService ardSyCarService;
+    @Autowired
+    private ArdSyCarLockService ardSyCarLockService;
+
     @GetMapping("/car")
     @ApiOperation("鏌ヨ鎵�鏈夋湭鎸傞攣鐨勮溅杈�")
     public Results car(){
-        return Results.succeed();
+        List<CarVo> list = ardSyCarLockService.car();
+        String usersId = SecurityUtils.getUserId();
+        ArdSyUser ardSyUser = iArdSyUserService.userById(usersId);
+        String syURL = sysConfigService.getSYURL();
+        for (int i = 0; i < list.size(); i++) {
+            CarVo carVo = list.get(i);
+            String carId = carVo.getCarId();
+            Results results = ardSyCarService.getCarGPSBycarId(usersId,carId,syURL,ardSyUser);
+            Map<String,Object> map = (Map<String, Object>) results.getData();
+            List list1 = (List) map.get("list");
+            JSONObject jsonObject = JSONObject.parseObject(JSONObject.toJSONString(list1.get(0)));
+            String carPlate = (String) jsonObject.get("carPlate");
+            carVo.setCarPlate(carPlate);
+            String drvName = (String) jsonObject.get("drvName");
+            carVo.setDrvName(drvName);
+            String drvPhone = (String) jsonObject.get("drvPhone");
+            carVo.setDrvPhone(drvPhone);
+        }
+        return Results.succeed(list);
     }
 
     @PostMapping("/add")
     @ApiOperation("娣诲姞rtu")
-    public Results add(){
-        return Results.succeed("鎴愬姛娣诲姞"+1+"鏉℃暟鎹�");
+    public Results add(String carId){
+        return Results.succeed("鎴愬姛娣诲姞"+ardSyCarLockService.addRtu(carId)+"鏉℃暟鎹�");
     }
 
     @DeleteMapping("/del")
     @ApiOperation("鍒犻櫎rtu")
-    public Results del(String id){
-        return Results.succeed("鎴愬姛鍒犻櫎"+1+"鏉℃暟鎹�");
-    }
-
-    @PutMapping("/upd")
-    @ApiOperation("淇敼rtu")
-    public Results upd(){
-        return Results.succeed("鎴愬姛淇敼"+1+"鏉℃暟鎹�");
+    public Results del(String carId){
+        return Results.succeed("鎴愬姛鍒犻櫎"+ardSyCarLockService.delCar(carId)+"鏉℃暟鎹�");
     }
 
     @GetMapping("/one")
-    @ApiOperation("鏌ヨ涓�鏉tu")
-    public Results one(String id){
-        return Results.succeed();
+    @ApiOperation("鏌ヨ涓�鏉tu鍙婇攣")
+    public Results one(String carId){
+        return Results.succeed(ardSyCarLockService.carLock(carId));
     }
 
     @GetMapping("/query")
-    @ApiOperation("鏌ヨ鎵�鏈塺tu")
+    @ApiOperation("鏌ヨ鎵�鏈塺tu鎸傝浇鐨勮溅杈�")
     public Results query(){
-        return Results.succeed();
+        return Results.succeed(ardSyCarLockService.carList());
     }
+
+    @GetMapping("/addLock")
+    @ApiOperation("娣诲姞淇敼閿�")
+    public Results addLock(@RequestBody List<ArdSyCarLock> locks){
+        return Results.succeed(ardSyCarLockService.addUpdLock(locks));
+    }
+
+
 }

--
Gitblit v1.9.3