From 9dbd1b03adca3920a249b9079153d5f53d01a47d Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期三, 01 十一月 2023 15:25:03 +0800
Subject: [PATCH] 清淤数据逻辑
---
ard-work/src/main/java/com/ruoyi/sy/controller/OilWallController.java | 54 +++++++++++-------------------------------------------
1 files changed, 11 insertions(+), 43 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..56f7333 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,15 @@
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;
@@ -35,15 +26,6 @@
@Autowired
private ArdOilWallService ardOilWallService;
-
- @Autowired
- private IArdSyCarService carService;
-
- @Autowired
- private IArdSyUserService iArdSyUserService;
-
- @Autowired
- private ISysConfigService sysConfigService;
@Autowired
private ArdAccessFenceService ardAccessFenceService;
@@ -80,9 +62,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,25 +76,16 @@
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());
}
@@ -122,15 +95,10 @@
return AjaxResult.success(ardAccessNumService.queryNum());
}
- @GetMapping("/updTime")
+ @PostMapping("/updTime")
@ApiOperation("淇濆瓨鏃堕棿姝ラ暱")
public AjaxResult updTime(@RequestBody ArdAccessNum ardAccessNum){
return AjaxResult.success(ardAccessNumService.add(ardAccessNum));
}
-// @GetMapping("/addCar")
-// @ApiOperation("鎵嬪姩娣诲姞杞﹁締")
-// public AjaxResult addCar(@RequestBody ArdAccessNum ardAccessNum){
-// return AjaxResult.success();
-// }
}
--
Gitblit v1.9.3