From 1b9a01bf5000714b08a75a50dd1f5f3eab65d888 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期五, 08 十二月 2023 17:18:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-other/src/main/java/com/dsh/other/controller/SiteController.java | 40 ++++++++++++++++++++++++++++++++--------
1 files changed, 32 insertions(+), 8 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 c1ba97c..da42599 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
@@ -128,7 +128,16 @@
}
}
-
+ /**
+ * 添加场地管理
+ *
+ * @return
+ */
+ @RequestMapping("/base/site/addSite1")
+ public Integer addSite1(@RequestBody Site site) {
+ boolean save = siteService.save(site);
+ return site.getId();
+ }
/**
* 添加场地管理
*
@@ -414,6 +423,7 @@
JSONObject jsonObject = JSONObject.parseObject(s);
Object code = jsonObject.get("code");
if (String.valueOf(code) != null && "200".equals(String.valueOf(code))) {
+ System.err.println("启动了一次游戏");
return 200;
} else {
return 500;
@@ -474,21 +484,22 @@
Date startTime = byId.getStartTime();
Date endTime = byId.getEndTime();
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
-
String startTimeString = sdf.format(startTime);
String endTimeString = sdf.format(endTime);
-
String result = startTimeString + "-" + endTimeString.substring(11);
byId.setTimes(result);
byId.setSid(Arrays.asList(storeId));
- List<Site> list = siteService.list(new LambdaQueryWrapper<Site>().eq(Site::getStoreId, storeId).eq(Site::getSign, 1));
- List<Integer> collect = list.stream().map(Site::getId).collect(Collectors.toList());
- byId.setRid(collect);
+// List<Site> list = siteService.list(new LambdaQueryWrapper<Site>()
+// .eq(Site::getStoreId, storeId)
+// .eq(Site::getSign, 1));
+// List<Integer> collect = list.stream().map(Site::getId).collect(Collectors.toList());
+ Integer siteId = byId.getSiteId();
+ ArrayList<Integer> list1 = new ArrayList<>();
+ list1.add(siteId);
+ byId.setRid(list1);
map.put("data", byId);
-
-
map.put("ids", ids);
return ResultUtil.success(map);
} catch (Exception e) {
@@ -682,6 +693,19 @@
}
+ @Autowired
+ private IUserService userService;
+
+
+ @ResponseBody
+ @PostMapping("/base/site/queryUserName")
+ public User queryUserName(@RequestBody Integer coachId){
+ User byId = userService.getById(coachId);
+
+ return byId;
+
+ }
+
@ResponseBody
@PostMapping("/base/site/queryOperator")
public OperatorUser queryOperator(@RequestBody List<Integer> stores) {
--
Gitblit v1.7.1