From 89a120b89cec79371bac9341e740ca73233080b0 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 04 十一月 2025 18:27:45 +0800
Subject: [PATCH] App预约场地操作
---
cloud-server-activity/src/main/java/com/dsh/activity/controller/HuiminController.java | 64 +++++++++++++++++--------------
1 files changed, 35 insertions(+), 29 deletions(-)
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/controller/HuiminController.java b/cloud-server-activity/src/main/java/com/dsh/activity/controller/HuiminController.java
index 6188bfa..b4aa058 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/controller/HuiminController.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/controller/HuiminController.java
@@ -391,10 +391,10 @@
if (new Date().after(start) && new Date().before(end)) {
//
Date date1 = new Date();
- jsonObject2.put("start_time", simpleDateFormat1.format( date1));
+ jsonObject2.put("start_time", date1.getTime()/ 1000);
date1.setTime(date1.getTime() + 30 * 1000);
if (start.before(end)) {
- jsonObject2.put("end_time", simpleDateFormat1.format( date1));
+ jsonObject2.put("end_time", date1.getTime()/ 1000);
jsonArray.add(jsonObject2);
}
}
@@ -405,8 +405,8 @@
JSONObject jsonObject3 = new JSONObject();
Date date1 = new Date();
date1.setTime(date1.getTime() - 300 * 1000);
- jsonObject3.put("end_time", simpleDateFormat1.format( date1));
- jsonObject3.put("start_time", simpleDateFormat1.format( date1));
+ jsonObject3.put("end_time", date1.getTime()/ 1000);
+ jsonObject3.put("start_time", date1.getTime()/ 1000);
jsonArray.add(jsonObject3);
}
@@ -418,8 +418,8 @@
JSONObject jsonObject3 = new JSONObject();
Date date1 = new Date();
date1.setTime(date1.getTime() - 300 * 1000);
- jsonObject3.put("end_time", simpleDateFormat1.format( date1));
- jsonObject3.put("start_time", simpleDateFormat1.format( date1));
+ jsonObject3.put("end_time", date1.getTime()/ 1000);
+ jsonObject3.put("start_time", date1.getTime()/ 1000);
jsonArray.add(jsonObject3);
}
@@ -429,13 +429,15 @@
TStudent tStudent = tStudents.stream().filter(e -> e.getId().equals(Integer.valueOf(payHuimin.getStudentId().split(",")[0]))).findFirst().orElse(null);
if (tStudent!=null){
huiminCardVO1.setStudentName(tStudent.getName());
- String temp = "{\"id\":"+payHuimin.getId() + ","+"\"sid\":" + sid.toJSONString() + "," + "\"rid\":" + rid + "," + "\"uid\":\"" + tStudent.getId() + "\"," + "\"time\":" + jsonArray.toJSONString() + ",\"type\":" + 2 + ",\"codeType\":"+4+"\"dataId\":"+payHuimin.getId()+"}";
+// String temp = "{\"id\":"+payHuimin.getId() + ","+"\"sid\":" + sid.toJSONString() + "," + "\"rid\":" + rid + "," + "\"uid\":\"" + tStudent.getId() + "\"," + "\"time\":" + jsonArray.toJSONString() + ",\"type\":" + 2 + ",\"codeType\":"+4+"\"dataId\":"+payHuimin.getId()+"}";
+ String temp = "{\"id\":"+payHuimin.getId() + ","+"\"sid\":" + sid.toJSONString() + "," + "\"rid\":" + rid + "," + "\"uid\":\"" + tStudent.getId() + "\"," + "\"time\":" + jsonArray.toJSONString() + ",\"type\":" + 2 +"}";
huiminCardVO1.setQrCode(temp);
}else{
huiminCardVO1.setStudentName("");
- String temp = "{\"id\":"+payHuimin.getId() + ","+"\"sid\":" + sid.toJSONString() + "," + "\"rid\":" + rid + "," + "\"uid\":\"" + 0 + "\"," + "\"time\":" + jsonArray.toJSONString() + ",\"type\":" + 2 + ",\"codeType\":"+4+"\"dataId\":"+payHuimin.getId()+"}";
+// String temp = "{\"id\":"+payHuimin.getId() + ","+"\"sid\":" + sid.toJSONString() + "," + "\"rid\":" + rid + "," + "\"uid\":\"" + 0 + "\"," + "\"time\":" + jsonArray.toJSONString() + ",\"type\":" + 2 + ",\"codeType\":"+4+"\"dataId\":"+payHuimin.getId()+"}";
+ String temp = "{\"id\":"+payHuimin.getId() + ","+"\"sid\":" + sid.toJSONString() + "," + "\"rid\":" + rid + "," + "\"uid\":\"" + 0 + "\"," + "\"time\":" + jsonArray.toJSONString() + ",\"type\":" + 2 +"}";
huiminCardVO1.setQrCode(temp);
}
huiminCardVOS.add(huiminCardVO1);
@@ -564,10 +566,10 @@
if (new Date().after(start) && new Date().before(end)) {
//
Date date1 = new Date();
- jsonObject2.put("start_time", simpleDateFormat1.format( date1));
+ jsonObject2.put("start_time", date1.getTime()/ 1000);
date1.setTime(date1.getTime() + 30 * 1000);
if (start.before(end)) {
- jsonObject2.put("end_time", simpleDateFormat1.format( date1));
+ jsonObject2.put("end_time", date1.getTime()/ 1000);
jsonArray.add(jsonObject2);
}
}
@@ -578,8 +580,8 @@
JSONObject jsonObject3 = new JSONObject();
Date date1 = new Date();
date1.setTime(date1.getTime() - 300 * 1000);
- jsonObject3.put("end_time", simpleDateFormat1.format( date1));
- jsonObject3.put("start_time", simpleDateFormat1.format( date1));
+ jsonObject3.put("end_time", date1.getTime()/ 1000);
+ jsonObject3.put("start_time", date1.getTime()/ 1000);
jsonArray.add(jsonObject3);
}
@@ -590,8 +592,8 @@
JSONObject jsonObject3 = new JSONObject();
Date date1 = new Date();
date1.setTime(date1.getTime() - 300 * 1000);
- jsonObject3.put("end_time", simpleDateFormat1.format( date1));
- jsonObject3.put("start_time", simpleDateFormat1.format( date1));
+ jsonObject3.put("end_time", date1.getTime()/ 1000);
+ jsonObject3.put("start_time", date1.getTime()/ 1000);
jsonArray.add(jsonObject3);
}
@@ -697,10 +699,10 @@
if (new Date().after(start) && new Date().before(end)) {
//
Date date1 = new Date();
- jsonObject2.put("start_time", simpleDateFormat1.format( date1));
+ jsonObject2.put("start_time", date1.getTime()/ 1000);
date1.setTime(date1.getTime() + 30 * 1000);
if (start.before(end)) {
- jsonObject2.put("end_time", simpleDateFormat1.format( date1));
+ jsonObject2.put("end_time", date1.getTime()/ 1000);
jsonArray.add(jsonObject2);
}
}
@@ -711,8 +713,8 @@
JSONObject jsonObject3 = new JSONObject();
Date date1 = new Date();
date1.setTime(date1.getTime() - 300 * 1000);
- jsonObject3.put("end_time", simpleDateFormat1.format( date1));
- jsonObject3.put("start_time", simpleDateFormat1.format( date1));
+ jsonObject3.put("end_time", date1.getTime()/ 1000);
+ jsonObject3.put("start_time", date1.getTime()/ 1000);
jsonArray.add(jsonObject3);
}
@@ -723,8 +725,8 @@
JSONObject jsonObject3 = new JSONObject();
Date date1 = new Date();
date1.setTime(date1.getTime() - 300 * 1000);
- jsonObject3.put("end_time", simpleDateFormat1.format( date1));
- jsonObject3.put("start_time", simpleDateFormat1.format( date1));
+ jsonObject3.put("end_time", date1.getTime()/ 1000);
+ jsonObject3.put("start_time", date1.getTime()/ 1000);
jsonArray.add(jsonObject3);
}
@@ -732,11 +734,13 @@
TStudent tStudent = tStudents.stream().filter(e -> e.getId().equals(studentId)).findFirst().orElse(null);
if (tStudent!=null){
huiminCardStudentVO.setStudentName(tStudent.getName());
- String temp = "{\"id\":"+tPayHuimin.getId() + ","+"\"sid\":" + sid.toJSONString() + "," + "\"rid\":" + rid + "," + "\"uid\":\"" + tStudent.getId() + "\"," + "\"time\":" + jsonArray.toJSONString() + ",\"type\":" + 2 + ",\"codeType\":"+4+"\"dataId\":"+tPayHuimin.getId()+"}";
+// String temp = "{\"id\":"+tPayHuimin.getId() + ","+"\"sid\":" + sid.toJSONString() + "," + "\"rid\":" + rid + "," + "\"uid\":\"" + tStudent.getId() + "\"," + "\"time\":" + jsonArray.toJSONString() + ",\"type\":" + 2 + ",\"codeType\":"+4+"\"dataId\":"+tPayHuimin.getId()+"}";
+ String temp = "{\"id\":"+tPayHuimin.getId() + ","+"\"sid\":" + sid.toJSONString() + "," + "\"rid\":" + rid + "," + "\"uid\":\"" + tStudent.getId() + "\"," + "\"time\":" + jsonArray.toJSONString() + ",\"type\":" + 2 +"}";
huiminCardStudentVO.setQrCode(temp);
}else{
huiminCardStudentVO.setStudentName("");
- String temp = "{\"id\":"+tPayHuimin.getId() + ","+"\"sid\":" + sid.toJSONString() + "," + "\"rid\":" + rid + "," + "\"uid\":\"" + 0 + "\"," + "\"time\":" + jsonArray.toJSONString() + ",\"type\":" + 2 + ",\"codeType\":"+4+"\"dataId\":"+tPayHuimin.getId()+"}";
+// String temp = "{\"id\":"+tPayHuimin.getId() + ","+"\"sid\":" + sid.toJSONString() + "," + "\"rid\":" + rid + "," + "\"uid\":\"" + 0 + "\"," + "\"time\":" + jsonArray.toJSONString() + ",\"type\":" + 2 + ",\"codeType\":"+4+"\"dataId\":"+tPayHuimin.getId()+"}";
+ String temp = "{\"id\":"+tPayHuimin.getId() + ","+"\"sid\":" + sid.toJSONString() + "," + "\"rid\":" + rid + "," + "\"uid\":\"" + 0 + "\"," + "\"time\":" + jsonArray.toJSONString() + ",\"type\":" + 2 +"}";
huiminCardStudentVO.setQrCode(temp);
}
@@ -965,10 +969,10 @@
if (new Date().after(start) && new Date().before(end)) {
//
Date date1 = new Date();
- jsonObject2.put("start_time", simpleDateFormat1.format( date1));
+ jsonObject2.put("start_time", date1.getTime()/ 1000);
date1.setTime(date1.getTime() + 30 * 1000);
if (start.before(end)) {
- jsonObject2.put("end_time", simpleDateFormat1.format( date1));
+ jsonObject2.put("end_time", date1.getTime()/ 1000);
jsonArray.add(jsonObject2);
}
}
@@ -979,8 +983,8 @@
JSONObject jsonObject3 = new JSONObject();
Date date1 = new Date();
date1.setTime(date1.getTime() - 300 * 1000);
- jsonObject3.put("end_time", simpleDateFormat1.format( date1));
- jsonObject3.put("start_time", simpleDateFormat1.format( date1));
+ jsonObject3.put("end_time", date1.getTime()/ 1000);
+ jsonObject3.put("start_time", date1.getTime()/ 1000);
jsonArray.add(jsonObject3);
}
@@ -991,14 +995,15 @@
JSONObject jsonObject3 = new JSONObject();
Date date1 = new Date();
date1.setTime(date1.getTime() - 300 * 1000);
- jsonObject3.put("end_time", simpleDateFormat1.format( date1));
- jsonObject3.put("start_time", simpleDateFormat1.format( date1));
+ jsonObject3.put("end_time", date1.getTime()/ 1000);
+ jsonObject3.put("start_time", date1.getTime()/ 1000);
jsonArray.add(jsonObject3);
}
}
- String temp = "{\"id\":"+tPayHuimin.getId() + ","+"\"sid\":" + sid.toJSONString() + "," + "\"rid\":" + rid + "," + "\"uid\":\"" + tPayHuimin.getStudentId().split(",")[0] + "\"," + "\"time\":" + jsonArray.toJSONString() + ",\"type\":" + 2 + ",\"codeType\":"+4+"\"dataId\":"+tPayHuimin.getId()+"}";
+// String temp = "{\"id\":"+tPayHuimin.getId() + ","+"\"sid\":" + sid.toJSONString() + "," + "\"rid\":" + rid + "," + "\"uid\":\"" + tPayHuimin.getStudentId().split(",")[0] + "\"," + "\"time\":" + jsonArray.toJSONString() + ",\"type\":" + 2 + ",\"codeType\":"+4+"\"dataId\":"+tPayHuimin.getId()+"}";
+ String temp = "{\"id\":"+tPayHuimin.getId() + ","+"\"sid\":" + sid.toJSONString() + "," + "\"rid\":" + rid + "," + "\"uid\":\"" + tPayHuimin.getStudentId().split(",")[0] + "\"," + "\"time\":" + jsonArray.toJSONString() + ",\"type\":" + 2 +"}";
myHuiminCardDetailVO.setQrCode(temp);
myHuiminCardDetailVO.setCardId(tPayHuimin.getCardId());
myHuiminCardDetailVO.setHuiminCard(byId);
@@ -1014,6 +1019,7 @@
}
}
+
/**
* 获取添加人员、选择人员说明文案
*/
--
Gitblit v1.7.1