From 2007d54cd001b6aba255d9f540d031818b06e203 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期二, 14 十一月 2023 16:58:50 +0800
Subject: [PATCH] lock请求方式

---
 ard-work/src/main/java/com/ruoyi/sy/controller/OilWallController.java |   78 +++++++++++++++++++++++----------------
 1 files changed, 46 insertions(+), 32 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 f69b2e9..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
@@ -1,16 +1,14 @@
 package com.ruoyi.sy.controller;
 
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.uuid.UUID;
-import com.ruoyi.sy.domain.ArdOilWall;
+import com.ruoyi.sy.domain.*;
 import com.ruoyi.sy.param.OilWallParam;
-import com.ruoyi.sy.service.ArdOilWallService;
-import com.ruoyi.sy.domain.ArdSyCar;
-import com.ruoyi.sy.domain.ArdSyUser;
-import com.ruoyi.sy.service.IArdSyCarService;
-import com.ruoyi.sy.service.IArdSyUserService;
+import com.ruoyi.sy.service.*;
 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;
@@ -31,65 +29,81 @@
     private ArdOilWallService ardOilWallService;
 
     @Autowired
-    private IArdSyCarService carService;
+    private ArdAccessFenceService ardAccessFenceService;
 
     @Autowired
-    private IArdSyUserService iArdSyUserService;
+    private ArdAccessNumService ardAccessNumService;
 
     @Autowired
     private ISysConfigService sysConfigService;
 
     @PostMapping("/add")
     @ApiOperation("娣诲姞鐢靛瓙鍥存爮")
-    public Results add(@RequestBody ArdOilWall ardOilWall){
+    public AjaxResult add(@RequestBody ArdOilWall ardOilWall){
         ardOilWall.setId(String.valueOf(UUID.randomUUID()));
         ardOilWall.setCreateBy(SecurityUtils.getUsername());
         ardOilWall.setCreateTime(new Date());
-        return Results.succeed("鎴愬姛娣诲姞"+ ardOilWallService.addOilWall(ardOilWall)+"鏉℃暟鎹�");
+        return AjaxResult.success("鎴愬姛娣诲姞"+ ardOilWallService.addOilWall(ardOilWall)+"鏉℃暟鎹�");
     }
 
     @DeleteMapping("/del")
     @ApiOperation("鍒犻櫎鐢靛瓙鍥存爮")
-    public Results del(String id){
-        return Results.succeed("鎴愬姛鍒犻櫎"+ ardOilWallService.delOilWall(id)+"鏉℃暟鎹�");
+    public AjaxResult del(String id){
+        return AjaxResult.success("鎴愬姛鍒犻櫎"+ ardOilWallService.delOilWall(id)+"鏉℃暟鎹�");
     }
 
     @PutMapping("/upd")
     @ApiOperation("淇敼鐢靛瓙鍥存爮")
-    public Results upd(@RequestBody ArdOilWall ardOilWall){
+    public AjaxResult upd(@RequestBody ArdOilWall ardOilWall){
         ardOilWall.setUpdateBy(SecurityUtils.getUsername());
         ardOilWall.setUpdateTime(new Date());
-        return Results.succeed("鎴愬姛淇敼"+ ardOilWallService.updOilWall(ardOilWall)+"鏉℃暟鎹�");
+        return AjaxResult.success("鎴愬姛淇敼"+ ardOilWallService.updOilWall(ardOilWall)+"鏉℃暟鎹�");
     }
 
     @GetMapping("/one")
     @ApiOperation("鏌ヨ涓�鏉＄數瀛愬洿鏍�")
-    public Results one(String id){
-        return Results.succeed(ardOilWallService.one(id));
+    public AjaxResult one(String id){
+        return AjaxResult.success(ardOilWallService.one(id));
+    }
+
+    @GetMapping("/queryPage")
+    @ApiOperation("鏉′欢鏌ヨ鎵�鏈夌數瀛愬洿鏍忓垎椤�")
+    public AjaxResult queryPage(OilWallParam oilWallParam){
+        if(oilWallParam.getPageNum()==null || oilWallParam.getPageNum() == 0){
+            oilWallParam.setPageNum(1);
+        }
+        if(oilWallParam.getPageSize()==null || oilWallParam.getPageSize() == 0){
+            oilWallParam.setPageSize(10);
+        }
+        PageHelper.startPage(oilWallParam.getPageNum(),oilWallParam.getPageSize());
+        List<ArdOilWall> list = ardOilWallService.query(oilWallParam);
+        return AjaxResult.success(new PageInfo<>(list));
     }
 
     @GetMapping("/query")
     @ApiOperation("鏌ヨ鎵�鏈夌數瀛愬洿鏍�")
-    public Results query(OilWallParam oilWallParam){
-        return Results.succeed(ardOilWallService.query(oilWallParam));
+    public AjaxResult query(){
+        List<ArdOilWall> list = ardOilWallService.all();
+        return AjaxResult.success(list);
     }
 
     @GetMapping("/wallCar")
     @ApiOperation("鎵�鏈夎繘鍏ュ洿鏍忕殑杞﹁締")
-    public Results 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 Results.succeed();
+    public AjaxResult wallCar(){
+        String url  = sysConfigService.selectConfigByKey("minioIn")+"/";
+        return AjaxResult.success(ardAccessFenceService.all(url));
     }
 
+    @GetMapping("/rollTime")
+    @ApiOperation("鏌ヨ鏃堕棿姝ラ暱")
+    public AjaxResult rollTime(){
+        return AjaxResult.success(ardAccessNumService.queryNum());
+    }
+
+    @PostMapping("/updTime")
+    @ApiOperation("淇濆瓨鏃堕棿姝ラ暱")
+    public AjaxResult updTime(@RequestBody ArdAccessNum ardAccessNum){
+        return AjaxResult.success(ardAccessNumService.upd(ardAccessNum));
+    }
 
 }

--
Gitblit v1.9.3