From 305fe6a8621998e5130d541660c2e3c5f02672d6 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期一, 30 十月 2023 09:27:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ard-work/src/main/java/com/ruoyi/sy/controller/OilWallController.java | 79 ++++++++++++++++++++++++++++++---------
1 files changed, 60 insertions(+), 19 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..c254d34 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,21 +1,27 @@
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.spring.SpringUtils;
import com.ruoyi.common.utils.uuid.UUID;
-import com.ruoyi.sy.domain.ArdOilWall;
+import com.ruoyi.sy.domain.*;
+import com.ruoyi.sy.mapper.ArdAccessNumMapper;
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.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;
@@ -39,44 +45,58 @@
@Autowired
private ISysConfigService sysConfigService;
+ @Autowired
+ private ArdAccessFenceService ardAccessFenceService;
+
+ @Autowired
+ private ArdAccessNumService ardAccessNumService;
+
@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("/query")
@ApiOperation("鏌ヨ鎵�鏈夌數瀛愬洿鏍�")
- public Results query(OilWallParam oilWallParam){
- return Results.succeed(ardOilWallService.query(oilWallParam));
+ public AjaxResult query(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("/wallCar")
@ApiOperation("鎵�鏈夎繘鍏ュ洿鏍忕殑杞﹁締")
- public Results wallCar(){
+ public AjaxResult wallCar(){
//鏌ヨ鎵�鏈夊凡鎸傝浇鐨勮溅杈�
List<ArdSyCar> carList = carService.all();
//鑾峰彇杞﹁締浣嶇疆
@@ -87,9 +107,30 @@
String carId = carList.get(i).getCarId();
carService.getCarGPSBycarId(usersId,carId,syURL,ardSyUser);
}
-
- return Results.succeed();
+ return AjaxResult.success();
}
+ @GetMapping("/accessAll")
+ @ApiOperation("鏌ヨ鎵�鏈夌數瀛愬洿鏍�")
+ public AjaxResult accessAll(){
+ return AjaxResult.success(ardAccessFenceService.all());
+ }
+ @GetMapping("/rollTime")
+ @ApiOperation("鏌ヨ鏃堕棿姝ラ暱")
+ public AjaxResult rollTime(){
+ return AjaxResult.success(ardAccessNumService.queryNum());
+ }
+
+ @GetMapping("/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