From 2cfcb15fdff730140b6a03a874466802704078eb Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期五, 22 十二月 2023 10:01:42 +0800
Subject: [PATCH] 群组

---
 ard-work/src/main/java/com/ruoyi/sy/controller/OilWallController.java |   61 ++++++++----------------------
 1 files changed, 17 insertions(+), 44 deletions(-)

diff --git a/ard-work/src/main/java/com/ruoyi/sy/controller/OilWallController.java b/ard-work/src/main/java/com/ruoyi/sy/controller/OilWallController.java
index c254d34..987456f 100644
--- a/ard-work/src/main/java/com/ruoyi/sy/controller/OilWallController.java
+++ b/ard-work/src/main/java/com/ruoyi/sy/controller/OilWallController.java
@@ -4,24 +4,16 @@
 import com.github.pagehelper.PageInfo;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.utils.SecurityUtils;
-import com.ruoyi.common.utils.spring.SpringUtils;
 import com.ruoyi.common.utils.uuid.UUID;
 import com.ruoyi.sy.domain.*;
-import com.ruoyi.sy.mapper.ArdAccessNumMapper;
 import com.ruoyi.sy.param.OilWallParam;
 import com.ruoyi.sy.service.*;
-import com.ruoyi.sy.service.impl.ArdAccessFenceServiceImpl;
-import com.ruoyi.sy.service.impl.ArdOilWallServiceImpl;
 import com.ruoyi.system.service.ISysConfigService;
-import com.ruoyi.utils.gps.GeoTools;
-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.awt.geom.Point2D;
-import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
@@ -37,19 +29,13 @@
     private ArdOilWallService ardOilWallService;
 
     @Autowired
-    private IArdSyCarService carService;
-
-    @Autowired
-    private IArdSyUserService iArdSyUserService;
-
-    @Autowired
-    private ISysConfigService sysConfigService;
-
-    @Autowired
     private ArdAccessFenceService ardAccessFenceService;
 
     @Autowired
     private ArdAccessNumService ardAccessNumService;
+
+    @Autowired
+    private ISysConfigService sysConfigService;
 
     @PostMapping("/add")
     @ApiOperation("娣诲姞鐢靛瓙鍥存爮")
@@ -80,9 +66,9 @@
         return AjaxResult.success(ardOilWallService.one(id));
     }
 
-    @GetMapping("/query")
-    @ApiOperation("鏌ヨ鎵�鏈夌數瀛愬洿鏍�")
-    public AjaxResult query(OilWallParam oilWallParam){
+    @GetMapping("/queryPage")
+    @ApiOperation("鏉′欢鏌ヨ鎵�鏈夌數瀛愬洿鏍忓垎椤�")
+    public AjaxResult queryPage(OilWallParam oilWallParam){
         if(oilWallParam.getPageNum()==null || oilWallParam.getPageNum() == 0){
             oilWallParam.setPageNum(1);
         }
@@ -94,26 +80,18 @@
         return AjaxResult.success(new PageInfo<>(list));
     }
 
+    @GetMapping("/query")
+    @ApiOperation("鏌ヨ鎵�鏈夌數瀛愬洿鏍�")
+    public AjaxResult query(){
+        List<ArdOilWall> list = ardOilWallService.all();
+        return AjaxResult.success(list);
+    }
+
     @GetMapping("/wallCar")
     @ApiOperation("鎵�鏈夎繘鍏ュ洿鏍忕殑杞﹁締")
     public AjaxResult wallCar(){
-        //鏌ヨ鎵�鏈夊凡鎸傝浇鐨勮溅杈�
-        List<ArdSyCar> carList = carService.all();
-        //鑾峰彇杞﹁締浣嶇疆
-        String usersId = SecurityUtils.getUserId();
-        ArdSyUser ardSyUser = iArdSyUserService.userById(usersId);
-        String syURL = sysConfigService.getSYURL();
-        for (int i = 0; i < carList.size(); i++) {
-            String carId = carList.get(i).getCarId();
-            carService.getCarGPSBycarId(usersId,carId,syURL,ardSyUser);
-        }
-        return AjaxResult.success();
-    }
-
-    @GetMapping("/accessAll")
-    @ApiOperation("鏌ヨ鎵�鏈夌數瀛愬洿鏍�")
-    public AjaxResult accessAll(){
-        return AjaxResult.success(ardAccessFenceService.all());
+        String url  = sysConfigService.selectConfigByKey("minioIn")+"/";
+        return AjaxResult.success(ardAccessFenceService.all(url));
     }
 
     @GetMapping("/rollTime")
@@ -122,15 +100,10 @@
         return AjaxResult.success(ardAccessNumService.queryNum());
     }
 
-    @GetMapping("/updTime")
+    @PostMapping("/updTime")
     @ApiOperation("淇濆瓨鏃堕棿姝ラ暱")
     public AjaxResult updTime(@RequestBody ArdAccessNum ardAccessNum){
-        return AjaxResult.success(ardAccessNumService.add(ardAccessNum));
+        return AjaxResult.success(ardAccessNumService.upd(ardAccessNum));
     }
 
-//    @GetMapping("/addCar")
-//    @ApiOperation("鎵嬪姩娣诲姞杞﹁締")
-//    public AjaxResult addCar(@RequestBody ArdAccessNum ardAccessNum){
-//        return AjaxResult.success();
-//    }
 }

--
Gitblit v1.9.3