From ded7b20c06c16646a1f718c32a78e463844da6da Mon Sep 17 00:00:00 2001
From: luo <2855143437@qq.com>
Date: 星期日, 08 十月 2023 15:11:01 +0800
Subject: [PATCH] 10.8
---
cloud-server-other/src/main/java/com/dsh/other/controller/SiteController.java | 75 +++++++++++++++++++++++++++++++------
1 files changed, 62 insertions(+), 13 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 d701c3b..8d86b0a 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
@@ -1,13 +1,10 @@
package com.dsh.other.controller;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.dsh.other.entity.Site;
import com.dsh.other.entity.SiteBooking;
import com.dsh.other.entity.SiteType;
-import com.dsh.other.entity.TSite;
import com.dsh.other.feignclient.account.CityManagerClient;
-import com.dsh.other.feignclient.account.model.CityManager;
import com.dsh.other.feignclient.activity.UserCouponClient;
import com.dsh.other.feignclient.activity.model.QueryUserCouponByIdAndUserId;
import com.dsh.other.feignclient.activity.model.UserCoupon;
@@ -16,7 +13,6 @@
import com.dsh.other.feignclient.model.SiteVo;
import com.dsh.other.model.*;
import com.dsh.other.model.dto.siteDto.TSiteDTO;
-import com.dsh.other.model.vo.questionVo.QuestionChangeStateVO;
import com.dsh.other.model.vo.siteVo.ExpireSiteSearchVO;
import com.dsh.other.model.vo.siteVo.SiteSearchVO;
import com.dsh.other.service.ISiteBookingService;
@@ -28,18 +24,15 @@
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
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
@@ -69,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);
-
}
/**
* 获取场地有效期在两个月内的场地列表
@@ -113,6 +118,33 @@
}
}
+
+ /**
+ * 添加场地管理
+ * @return
+ */
+ @RequestMapping("/base/site/addSiteBooking")
+ public Object addSiteBooking(@RequestBody SiteBooking siteBooking){
+ if(siteBooking.getId()!= null ){
+
+ return siteBookingService.updateById(siteBooking);
+ }else {
+ return siteBookingService.save(siteBooking);
+ }
+ }
+
+ @RequestMapping("/base/site/listById")
+ public Site listById(@RequestParam("id") Integer id){
+ Site byId = siteService.getById(id);
+ return byId;
+ }
+
+
+ @RequestMapping("/base/site/listBooks")
+ public List<SiteBooking> listBooks(@RequestParam("id") Integer id){
+ List<SiteBooking> siteId = siteBookingService.list(new QueryWrapper<SiteBooking>().eq("siteId", id));
+ return siteId;
+ }
@ResponseBody
@PostMapping("/base/site/querySiteType")
@ApiOperation(value = "获取场地类型", tags = {"用户—预约场地"})
@@ -143,7 +175,6 @@
return ResultUtil.runErr();
}
}
-
@@ -309,6 +340,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
@@ -324,6 +371,8 @@
if(null == uid){
return ResultUtil.tokenErr();
}
+
+
return siteService.cancelMySite(uid, id);
}catch (Exception e){
e.printStackTrace();
--
Gitblit v1.7.1