From 8a8a13eb80498e9b905b47b8dc4d52cd8fdb8497 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期二, 24 十月 2023 16:36:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ard-work/src/main/java/com/ruoyi/sy/controller/OilWallController.java | 43 +++++++++++++++++++++++++++++++++++++------
1 files changed, 37 insertions(+), 6 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..af41116 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,24 @@
package com.ruoyi.sy.controller;
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;
@@ -38,6 +41,12 @@
@Autowired
private ISysConfigService sysConfigService;
+
+ @Autowired
+ private ArdAccessFenceService ardAccessFenceService;
+
+ @Autowired
+ private ArdAccessNumService ardAccessNumService;
@PostMapping("/add")
@ApiOperation("娣诲姞鐢靛瓙鍥存爮")
@@ -91,5 +100,27 @@
return Results.succeed();
}
+ @GetMapping("/accessAll")
+ @ApiOperation("鏌ヨ鎵�鏈夌數瀛愬洿鏍�")
+ public Results accessAll(){
+ return Results.succeed(ardAccessFenceService.all());
+ }
+ @GetMapping("/rollTime")
+ @ApiOperation("鏌ヨ鏃堕棿姝ラ暱")
+ public Results rollTime(){
+ return Results.succeed(ardAccessNumService.queryNum());
+ }
+
+ @GetMapping("/updTime")
+ @ApiOperation("淇濆瓨鏃堕棿姝ラ暱")
+ public Results updTime(@RequestBody ArdAccessNum ardAccessNum){
+ return Results.succeed(ardAccessNumService.add(ardAccessNum));
+ }
+
+// @GetMapping("/addCar")
+// @ApiOperation("鎵嬪姩娣诲姞杞﹁締")
+// public Results addCar(@RequestBody ArdAccessNum ardAccessNum){
+// return Results.succeed();
+// }
}
--
Gitblit v1.9.3