From 56ea74f3d449c9821b3b02bad61178c03b1d7e9a Mon Sep 17 00:00:00 2001
From: 许鹏程 <1821349743@qq.com>
Date: 星期四, 22 八月 2024 11:22:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/product/administration/controller/ConferenceManagerController.java | 66 ++++++++++++++++++++++++++++++---
1 files changed, 60 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/product/administration/controller/ConferenceManagerController.java b/src/main/java/com/product/administration/controller/ConferenceManagerController.java
index ba7967e..b12bb1f 100644
--- a/src/main/java/com/product/administration/controller/ConferenceManagerController.java
+++ b/src/main/java/com/product/administration/controller/ConferenceManagerController.java
@@ -19,7 +19,9 @@
import com.product.module.sys.config.SystemErrorCode;
import com.product.module.sys.version.ApiVersion;
import com.product.util.BaseUtil;
+import org.omg.CORBA.DATA_CONVERSION;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -28,6 +30,9 @@
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.OutputStream;
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
@@ -533,18 +538,18 @@
response.setDateHeader("Expires", 0);
OutputStream stream = response.getOutputStream();
- //鍚庣璺宠浆鍦板潃
- // String content = ("http://www.baidu.com");
+
JSONObject jsonData = new JSONObject();
jsonData.put("uuid",uuid);
- jsonData.put("date",new Date());
- //jsonData.put("url",content);
+ Date date = new Date();
+ SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ String formatDate = dateFormat.format(date);
+ jsonData.put("date",formatDate);
//鑾峰彇涓�涓簩缁寸爜鍥剧墖
BitMatrix bitMatrix = conferenceManagerService.getQrCode(jsonData.toString());
//浠ユ祦鐨勫舰寮忚緭鍑哄埌鍓嶇
MatrixToImageWriter.writeToStream(bitMatrix , "jpg" , stream);
-
- }
+ }
}
@@ -574,6 +579,55 @@
}
+ /**
+ * 浼氳绛惧埌鍔熻兘
+ * @param request
+ * @return
+ * @throws ParseException
+ */
+ @PostMapping("/conference_sign/{version}")
+ @ApiVersion(1)
+ public String ConferenceSign(HttpServletRequest request) throws ParseException {
+ //鑾峰彇鍙傛暟
+ FieldSetEntity fse = null;
+ Object bean = request.getAttribute(CoreConst.API_POST_REQUEST_DATA);
+ if (bean != null) {
+ RequestParameterEntity reqp = (RequestParameterEntity) bean;
+ fse = reqp.getFormData();
+ }
+ //鍒ゆ柇鍙傛暟鏄惁涓虹┖
+ if (bean == null || fse == null) {
+ return this.error(com.product.admin.config.SystemCode.SYSTEM_FORM_NODATA.getValue(), com.product.admin.config.SystemCode.SYSTEM_FORM_NODATA.getText());
+ }
+ String s = conferenceManagerService.ConferenceSign(fse);
+ return OK(s);
+ }
+
+
+ /**
+ * 鑾峰彇绛惧埌淇℃伅
+ * @param request
+ * @return
+ */
+ @PostMapping("/get_signOrVisit_info/{version}")
+ @ApiVersion(1)
+ public String getSignOrVisitInfo(HttpServletRequest request){
+
+ FieldSetEntity fse = null;
+ Object bean = request.getAttribute(CoreConst.API_POST_REQUEST_DATA);
+ if (bean != null) {
+ RequestParameterEntity reqp = (RequestParameterEntity) bean;
+ fse = reqp.getFormData();
+ }
+ //鍒ゆ柇鍙傛暟鏄惁涓虹┖
+ if (bean == null || fse == null) {
+ return this.error(com.product.admin.config.SystemCode.SYSTEM_FORM_NODATA.getValue(), com.product.admin.config.SystemCode.SYSTEM_FORM_NODATA.getText());
+ }
+ HashMap signInfo = conferenceManagerService.getSignOrVisitInfo(fse);
+ return OK(signInfo);
+
+ }
+
}
--
Gitblit v1.9.2