From 78a4df6ad36a5cdf18d40ef539e0ce9609c71b4f Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期六, 07 十月 2023 15:33:28 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai
---
cloud-server-other/src/main/java/com/dsh/other/controller/SiteController.java | 39 ++++++++++++++++++++++++++++++++-------
1 files changed, 32 insertions(+), 7 deletions(-)
diff --git a/cloud-server-other/src/main/java/com/dsh/other/controller/SiteController.java b/cloud-server-other/src/main/java/com/dsh/other/controller/SiteController.java
index 9d8a468..5c0343c 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/controller/SiteController.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/controller/SiteController.java
@@ -32,10 +32,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.PrintWriter;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
/**
* @author zhibing.pu
@@ -65,16 +62,28 @@
@Autowired
private CityManagerClient cityManagerClient;
-
+ /**
+ * 获取所有场地
+ */
+ @RequestMapping("/base/site/getList")
+ @ResponseBody
+ public List<Site> getList(){
+ return siteService.list(new QueryWrapper<Site>().ne("state",3));
+ }
+ /**
+ * 获取场地预约记录
+ */
+ @RequestMapping("/base/site/listAll")
+ public List<SiteBooking> listAll(@RequestBody SiteBookingQuery query){
+ return siteBookingService.listAll(query);
+ }
/**
* 获取所有场地
* @return
*/
@RequestMapping("/base/site/list")
public List<TSiteDTO> listAll(@RequestBody SiteSearchVO vo){
-
return siteTypeService.listAll(vo);
-
}
/**
* 获取场地有效期在两个月内的场地列表
@@ -304,6 +313,22 @@
return ResultUtil.runErr();
}
}
+ @ResponseBody
+ @PostMapping("/api/site/queryMySiteById")
+ @ApiOperation(value = "获取我的预约场地列表详情2.0", tags = {"用户—预约场地"})
+ @ApiImplicitParams({
+ @ApiImplicitParam(value = "id", name = "id", dataType = "int", required = true),
+ @ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
+ })
+ public ResultUtil<SiteBooking> queryMySiteById(Integer id){
+ try {
+ SiteBooking byId = siteBookingService.getById(id);
+ return ResultUtil.success(byId);
+ }catch (Exception e){
+ e.printStackTrace();
+ return ResultUtil.runErr();
+ }
+ }
@ResponseBody
--
Gitblit v1.7.1