查询附近常客隆超市或停车场

gather-app/src/main/java/com/ruoyi/database/controller/BaseCustomerInfoController.java

@@ -16,7 +16,7 @@ import org.springframework.web.bind.annotation.*;
 import java.util.List;
 
 @RequestMapping("/BaseCustomerInfo")
-@Api(tags = "02-基础管理-客户管理")
+@Api(tags = "客户管理")
 @RestController
 @RequiredArgsConstructor
 public class BaseCustomerInfoController extends BaseController {
@@ -24,7 +24,7 @@ public class BaseCustomerInfoController extends BaseController {
     private final BaseCustomerInfoService baseCustomerInfoService;
 
     @GetMapping
-    @ApiOperation("查询客户管理")
+    @ApiOperation("基础管理-查询客户管理")
     public TableDataInfo<BaseCustomerInfo> list(BaseCustomerInfo baseCustomerInfo) {
         startPage();
         QueryWrapper<BaseCustomerInfo> queryWrapper = new QueryWrapper<>(baseCustomerInfo);
@@ -34,21 +34,21 @@ public class BaseCustomerInfoController extends BaseController {
     }
 
     @PostMapping
-    @ApiOperation("新增客户管理")
+    @ApiOperation("基础管理-新增客户管理")
     @Log(title = "客户管理表", businessType = BusinessType.INSERT)
     public AjaxResult insert(@RequestBody BaseCustomerInfo baseCustomerInfo) {
         return toAjax(baseCustomerInfoService.save(baseCustomerInfo));
     }
 
     @PutMapping
-    @ApiOperation("修改客户管理")
+    @ApiOperation("基础管理-修改客户管理")
     @Log(title = "客户管理表", businessType = BusinessType.UPDATE)
     public AjaxResult update(@RequestBody BaseCustomerInfo baseCustomerInfo) {
         return toAjax(baseCustomerInfoService.updateById(baseCustomerInfo));
     }
 
     @DeleteMapping
-    @ApiOperation("删除客户管理")
+    @ApiOperation("基础管理-删除客户管理")
     @Log(title = "客户管理表", businessType = BusinessType.DELETE)
     public AjaxResult delete(@RequestParam("idList") List<Long> idList) {
         return toAjax(baseCustomerInfoService.removeByIds(idList));

gather-app/src/main/java/com/ruoyi/database/controller/BaseParkingLotInfoController.java

@@ -7,7 +7,9 @@ import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.database.domain.BaseParkingLotInfo;
+import com.ruoyi.database.domain.ParkingNearInfo;
 import com.ruoyi.database.service.BaseParkingLotInfoService;
+import com.ruoyi.database.service.ParkingNearInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
@@ -16,15 +18,16 @@ import org.springframework.web.bind.annotation.*;
 import java.util.List;
 
 @RequestMapping("/BaseParkingLotInfo")
-@Api(tags = "01-基础管理-停车场管理")
+@Api(tags = "停车场管理")
 @RestController
 @RequiredArgsConstructor
 public class BaseParkingLotInfoController extends BaseController {
 
     private final BaseParkingLotInfoService baseParkingLotInfoService;
+    private final ParkingNearInfoService parkingNearInfoService;
 
     @GetMapping
-    @ApiOperation("查询停车场管理")
+    @ApiOperation("基础管理-查询停车场管理")
     public TableDataInfo<BaseParkingLotInfo> list(BaseParkingLotInfo baseParkingLotInfo) {
         startPage();
         QueryWrapper<BaseParkingLotInfo> queryWrapper = new QueryWrapper<>(baseParkingLotInfo);
@@ -34,23 +37,34 @@ public class BaseParkingLotInfoController extends BaseController {
     }
 
     @PostMapping
-    @ApiOperation("新增停车场管理")
+    @ApiOperation("基础管理-新增停车场管理")
     @Log(title = "停车场管理表", businessType = BusinessType.INSERT)
     public AjaxResult insert(@RequestBody BaseParkingLotInfo baseParkingLotInfo) {
         return toAjax(baseParkingLotInfoService.save(baseParkingLotInfo));
     }
 
     @PutMapping
-    @ApiOperation("修改停车场管理")
+    @ApiOperation("基础管理-修改停车场管理")
     @Log(title = "停车场管理表", businessType = BusinessType.UPDATE)
     public AjaxResult update(@RequestBody BaseParkingLotInfo baseParkingLotInfo) {
         return toAjax(baseParkingLotInfoService.updateById(baseParkingLotInfo));
     }
 
     @DeleteMapping
-    @ApiOperation("删除停车场管理")
+    @ApiOperation("基础管理-删除停车场管理")
     @Log(title = "停车场管理表", businessType = BusinessType.DELETE)
     public AjaxResult delete(@RequestParam("idList") List<Long> idList) {
         return toAjax(baseParkingLotInfoService.removeByIds(idList));
     }
+
+
+    @GetMapping("/ParkingNear")
+    @ApiOperation("查询附近常客隆超市或停车场")
+    public TableDataInfo<ParkingNearInfo> list(ParkingNearInfo parkingNearInfo) {
+        startPage();
+        QueryWrapper<ParkingNearInfo> queryWrapper = new QueryWrapper<>(parkingNearInfo);
+        List<ParkingNearInfo> list = parkingNearInfoService.list(queryWrapper);
+        long size = parkingNearInfoService.count(queryWrapper);
+        return getDataTableEnhance(list,size);
+    }
 }